Don't use the foreground color for selected cells, Don't use the

2004-11-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcellrenderertext.c (get_layout): Don't use the foreground
	color for selected cells, Don't use the background color
	in unfocused selected cells. Also avoid creating two PangoLayouts
	per render call.  (#154615, #154611, Billy Biggs)

diff --git a/ChangeLog b/ChangeLog
index 80b47e48381b349e9922340b2ae24746bd90391b..ad27a4f58b0ea7fc22089b63d795c191d05460b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellrenderertext.c (get_layout): Don't use the foreground
+       color for selected cells, Don't use the background color
+       in unfocused selected cells. Also avoid creating two PangoLayouts
+       per render call.  (#154615, #154611, Billy Biggs)
+
 Mon Nov 15 19:02:07 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/abicheck.sh

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 80b47e48381b349e9922340b2ae24746bd90391b..ad27a4f58b0ea7fc22089b63d795c191d05460b3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-11-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellrenderertext.c (get_layout): Don't use the foreground
+       color for selected cells, Don't use the background color
+       in unfocused selected cells. Also avoid creating two PangoLayouts
+       per render call.  (#154615, #154611, Billy Biggs)
+
 Mon Nov 15 19:02:07 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/abicheck.sh

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 80b47e48381b349e9922340b2ae24746bd90391b..ad27a4f58b0ea7fc22089b63d795c191d05460b3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-11-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellrenderertext.c (get_layout): Don't use the foreground
+       color for selected cells, Don't use the background color
+       in unfocused selected cells. Also avoid creating two PangoLayouts
+       per render call.  (#154615, #154611, Billy Biggs)
+
 Mon Nov 15 19:02:07 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/abicheck.sh

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 80b47e48381b349e9922340b2ae24746bd90391b..ad27a4f58b0ea7fc22089b63d795c191d05460b3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-11-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellrenderertext.c (get_layout): Don't use the foreground
+       color for selected cells, Don't use the background color
+       in unfocused selected cells. Also avoid creating two PangoLayouts
+       per render call.  (#154615, #154611, Billy Biggs)
+
 Mon Nov 15 19:02:07 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/abicheck.sh

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index ac41ab5f25c8d1078005647a9a357a39f5c196ac..1fff846203443ff76488da3c0be71fa2631031a6 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1258,7 +1258,8 @@ get_layout (GtkCellRendererText *celltext,
        * background_area not the PangoLayout area
        */
       
-      if (celltext->foreground_set)
+      if (celltext->foreground_set
+         && (flags & GTK_CELL_RENDERER_SELECTED) == 0)
         {
           PangoColor color;
 
@@ -1324,17 +1325,17 @@ get_layout (GtkCellRendererText *celltext,
 }
 
 static void
-gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
-                                GtkWidget       *widget,
-                                GdkRectangle    *cell_area,
-                                gint            *x_offset,
-                                gint            *y_offset,
-                                gint            *width,
-                                gint            *height)
+get_size (GtkCellRenderer *cell,
+         GtkWidget       *widget,
+         GdkRectangle    *cell_area,
+         PangoLayout     *layout,
+         gint            *x_offset,
+         gint            *y_offset,
+         gint            *width,
+         gint            *height)
 {
   GtkCellRendererText *celltext = (GtkCellRendererText *) cell;
   PangoRectangle rect;
-  PangoLayout *layout;
   GtkCellRendererTextPrivate *priv;
 
   priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
@@ -1378,7 +1379,10 @@ gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
        return;
     }
   
-  layout = get_layout (celltext, widget, FALSE, 0);
+  if (layout)
+    g_object_ref (layout);
+  else
+    layout = get_layout (celltext, widget, FALSE, 0);
 
   pango_layout_get_pixel_extents (layout, NULL, &rect);
   
@@ -1430,6 +1434,20 @@ gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
   g_object_unref (layout);
 }
 
+
+static void
+gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
+                                GtkWidget       *widget,
+                                GdkRectangle    *cell_area,
+                                gint            *x_offset,
+                                gint            *y_offset,
+                                gint            *width,
+                                gint            *height)
+{
+  get_size (cell, widget, cell_area, NULL,
+           x_offset, y_offset, width, height);
+}
+
 static void
 gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
                               GdkDrawable          *window,
@@ -1450,8 +1468,7 @@ gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
   priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
 
   layout = get_layout (celltext, widget, TRUE, flags);
-
-  gtk_cell_renderer_text_get_size (cell, widget, cell_area, &x_offset, &y_offset, NULL, NULL);
+  get_size (cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
 
   if (!cell->sensitive) 
     {
@@ -1477,7 +1494,8 @@ gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
        state = GTK_STATE_NORMAL;
     }
 
-  if (celltext->background_set && state != GTK_STATE_SELECTED)
+  if (celltext->background_set && 
+      (flags & GTK_CELL_RENDERER_SELECTED) == 0)
     {
       GdkColor color;
       GdkGC *gc;